Remove remaining duplication in fluid/power/factory blocks#38
Merged
Remove remaining duplication in fluid/power/factory blocks#38
Conversation
Replace inline listOf(BlockFace.NORTH, ...) with the inherited ADJACENT_FACES constant from AtlasBlock.
Add propertyName to FluidType enum and move the duplicated updateFluidState() method into FluidBlock. FluidContainer reuses it inside its own updateProperties() alongside fill_level.
CobblestoneFactory and ObsidianFactory had nearly identical powerUpdate() and hasFluidAvailable() methods. Pull shared logic into an abstract MaterialFactory with powerCost and outputMaterial as the only varying properties.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ADJACENT_FACESin PowerSplitter and FluidMerger instead of inline face listsupdateFluidState()toFluidBlockbase class, addpropertyNametoFluidTypeenum, and remove duplicate methods from FluidPipe, FluidMerger, FluidSplitter — FluidContainer reuses it insideupdateProperties()MaterialFactorybase class from CobblestoneFactory/ObsidianFactory with sharedpowerUpdate()andhasFluidAvailable()logic